@@ -13,8 +13,8 @@ android { |
||
13 | 13 |
applicationId "ai.pai.client" |
14 | 14 |
minSdkVersion MIN_SDK_VERSION as int |
15 | 15 |
targetSdkVersion TARGET_SDK_VERSION as int |
16 |
- versionCode 1030 |
|
17 |
- versionName "1.0.30" |
|
16 |
+ versionCode 1100 |
|
17 |
+ versionName "1.1.00" |
|
18 | 18 |
buildConfigField "boolean","isDevMode","true" |
19 | 19 |
manifestPlaceholders = [CHANNEL_NAME: "guanwang"] |
20 | 20 |
|
@@ -23,41 +23,15 @@ |
||
23 | 23 |
android:layout_height="match_parent" |
24 | 24 |
android:visibility="gone"> |
25 | 25 |
|
26 |
- <View |
|
27 |
- android:layout_width="match_parent" |
|
28 |
- android:layout_height="150dp" |
|
29 |
- android:layout_gravity="bottom" |
|
30 |
- android:background="@drawable/login_bottom_mask" /> |
|
31 |
- |
|
32 | 26 |
<RelativeLayout |
33 | 27 |
android:id="@+id/btn_login" |
34 |
- android:layout_width="match_parent" |
|
28 |
+ android:layout_width="180dp" |
|
35 | 29 |
android:layout_height="48dp" |
36 | 30 |
android:layout_gravity="center_horizontal|bottom" |
37 | 31 |
android:layout_marginBottom="70dp" |
38 |
- android:layout_marginLeft="24dp" |
|
39 |
- android:layout_marginRight="24dp" |
|
40 | 32 |
android:background="@drawable/login_btn_bg" |
41 | 33 |
android:gravity="center"> |
42 | 34 |
|
43 |
- |
|
44 |
- <ImageView |
|
45 |
- android:id="@+id/iv_login_wx" |
|
46 |
- android:layout_width="32dp" |
|
47 |
- android:layout_height="32dp" |
|
48 |
- android:layout_centerVertical="true" |
|
49 |
- android:src="@drawable/login_weixin_logo" /> |
|
50 |
- |
|
51 |
- <TextView |
|
52 |
- android:layout_width="wrap_content" |
|
53 |
- android:layout_height="wrap_content" |
|
54 |
- android:layout_centerVertical="true" |
|
55 |
- android:layout_marginLeft="6dp" |
|
56 |
- android:layout_toRightOf="@id/iv_login_wx" |
|
57 |
- android:gravity="center" |
|
58 |
- android:text="@string/weixin_login" |
|
59 |
- android:textColor="@color/white" |
|
60 |
- android:textSize="16sp" /> |
|
61 | 35 |
</RelativeLayout> |
62 | 36 |
|
63 | 37 |
<RelativeLayout |
@@ -76,7 +50,7 @@ |
||
76 | 50 |
android:layout_width="wrap_content" |
77 | 51 |
android:layout_height="wrap_content" |
78 | 52 |
android:gravity="center" |
79 |
- android:textColor="@color/white" |
|
53 |
+ android:textColor="@color/grey" |
|
80 | 54 |
android:textSize="14sp" /> |
81 | 55 |
</RelativeLayout> |
82 | 56 |
</FrameLayout> |